Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xx-apt: add special case for ubuntu repo switch #49

Merged
merged 1 commit into from
Nov 17, 2021

Conversation

tonistiigi
Copy link
Owner

Signed-off-by: Tonis Tiigi [email protected]


if echo "$p" | grep -E "^(deb|deb-src) "; then
case "${nativearch}" in
amd64 | 386)
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes all active rules to the current arch group and adds a duplicate rule for the additional group.

Alternative would be to set current rules only to the current native arch and add detect the ubuntu distro and add only the known rules for that arch, each time fixed to individual arch.

Maybe the second one is better. wdyt? @crazy-max

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternative would be to set current rules only to the current native arch and add detect the ubuntu distro and add only the known rules for that arch, each time fixed to individual arch.

Yes, the second solution with native arch might be better in the long run.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's merge this one. I'll make a new PR and we can see if it actually improves.

@tonistiigi
Copy link
Owner Author

I removed 18.04 from CI. The llvm version is way too low for anything meaningful. bionic-backports might be enough but adding rules to them in cross-platform way is hacky as well. Other than clang suite, 18.04 seemed to pass.

@crazy-max
Copy link
Collaborator

I removed 18.04 from CI. The llvm version is way too low for anything meaningful. bionic-backports might be enough but adding rules to them in cross-platform way is hacky as well. Other than clang suite, 18.04 seemed to pass.

I've started the follow-up for #52 and on fedora 35 (stable) llvm version is quite new in my case 13.0.0~rc1.

@crazy-max crazy-max merged commit adf7fbb into master Nov 17, 2021
@crazy-max crazy-max deleted the tonistiigi/ubuntu-apt branch November 17, 2021 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants